Merge branch 'staging' of xenbits.xen.org:/home/xen/git/xen into staging
authorIan Jackson <ian.jackson@eu.citrix.com>
Thu, 11 Apr 2013 12:18:40 +0000 (13:18 +0100)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Thu, 11 Apr 2013 12:18:40 +0000 (13:18 +0100)
commit1386ee2fc211b1c9cc245e6f56160fff03ead7ca
tree1e67be870a003b79de8a1619c82a922a74694240
parent9e14c516b6cbac4c676c988e577cea2ef78eebf6
parentf3056b0fefc3c18990c281bc33de81c8046ab2f0
Merge branch 'staging' of xenbits.xen.org:/home/xen/git/xen into staging